Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 04:20:20 +0000 (21:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 04:20:20 +0000 (21:20 -0700)

Trivial merge